Auto merge of #1617 - alexcrichton:fix-kind-after-the-fact, r=brson

The wrong kind was mistakenly used in the case of having a dependency on a
plugin.

Unfortunately I don't know of a great way to test this, so no unit test is included for now.

Closes #1612

diff --cc src/cargo/ops/cargo_rustc/mod.rs
Simple merge